You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
fix(server): restored worktrees find pushed thread work on a non-origin remote - #35769
When a thread's worktree and local branch were both missing, recreateMissingWorktree looked for the pushed thread tip only at refs/remotes/origin/, and the detached-HEAD fallback in resolveRecreateBase looked only at refs/remotes/origin/HEAD. With a sole remote under another name (e.g. 'upstream') both checks missed, so the branch was silently recreated from the project branch or HEAD and the pushed commits were lost. Recovery now resolves the repository's primary remote with the existing GitVcsDriver.resolvePrimaryRemoteName ('origin' when present, else the first remote; already used by GitManager and the driver's base-ref logic), now exposed through GitWorkflowService. It uses that remote for both the pushed-branch lookup and the remote-HEAD fallback. With no remote, both lookups are skipped and the branch is rebuilt from the project branch or HEAD as before (resolvePrimaryRemoteName errors are mapped to null with orElseSucceed, the existing pattern). No new regex or parser.
On origin/main 59e64ee I extended the existing real-git integration test 'recovers the local or pushed thread tip, else the current branch, remote default, or detached HEAD' in apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts. The test drives ProviderTurnStartServiceV2.start, which calls makeRestoreMissingWorktree, against real repositories and a local bare remote. The new 'pushed-sole-remote' scenario follows the earlier scenarios, which push feature/restore and leave the project checkout detached at the project tip. It renames the only remote from origin to upstream (refs/remotes/upstream/feature/restore keeps the pushed thread tip), removes the worktree, prunes, and deletes the local feature/restore branch, then starts a turn. Result: the recreated worktree's HEAD was the project tip (ba44853d…), not the pushed thread tip (a98d02d5…), and thread.txt was missing. The unmodified test passes on main. Run with: cd apps/server && vp test run src/orchestration-v2/ProviderTurnStartService.test.ts -t "recovers the local or pushed". There was no UI or provider run; the test exercises the server's turn-start recovery path with real git.
Evidence
Web client, Chromium, 1280×800, light theme, fresh synthetic state and Replay provider on both commits.
Create a worktree thread, commit thread.txt, and push feature/restore. Detach the project checkout at an unrelated commit containing project.txt. Rename the only remote from origin to upstream, remove the worktree, prune, and delete the local thread branch. Resume through the web composer and open Files.
The changed remote-default fallback and selection among multiple remotes were not exercised; this proof covers the reported pushed branch on a sole remote named upstream.
Tests
cd apps/server && vp test run src/orchestration-v2/ProviderTurnStartService.test.ts -t "recovers the local or pushed": fails without the fix (wrong worktree HEAD commit), passes with it. vp run check:changed: format, lint, knip, graphql, typecheck (3 packages), tests (3 files, 53 tests) all passed.
Not in this change
With several remotes where origin exists but the thread was pushed to another remote, recovery still looks only at origin; the branch's configured upstream is gone with the deleted local branch, so picking among remotes would be a separate design change.
Who did the work
Written by Claude Opus 5.5, in Claude Code
Reviewed by GPT-6.1 Sol, in Codex, and by Claude Opus 5.5, each on its own
Proof captured by GPT-6.1 Sol and checked by Claude Opus 5.5
… non-origin remote
Fails on main: recovery only checks refs/remotes/origin/<branch>, so a
thread pushed to a remote named upstream is recreated from the project
branch instead (#35751).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…in remote
Worktree recovery looked for the pushed thread tip only at
refs/remotes/origin/<branch>, and its detached fallback only at
refs/remotes/origin/HEAD. With a sole remote under another name, it
silently recreated the branch from the project branch or HEAD, dropping
the pushed commits. Recovery now uses the repository's primary remote
(origin when present, else the first remote), as other git flows do.
Fixes#35751
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Macroscope's review found this PR approvable — Missing-worktree recovery now finds pushed branches on the repository’s primary remote rather than assuming origin. The change remains limited to absent managed worktrees and uses existing local tracking refs without fetching or publishing.
You can add or adjust custom eligibility rules. Learn more.
No actionable comments were generated in the recent review.
Walkthrough
Missing-worktree recovery now resolves the primary remote instead of assuming origin. It uses that remote to find a pushed branch and select a default base. A test covers recovery when the sole remote is upstream.
GitWorkflowService adds resolvePrimaryRemoteName(cwd). The method resolves the Git driver for the working directory and delegates the lookup.
Remote-aware recovery and test apps/server/src/workspace/restoreMissingWorktree.ts, apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
Recovery uses the resolved remote to check for a pushed branch and select a default base. If remote lookup fails, recovery treats the remote as unavailable. The test covers a sole remote named upstream and restores origin before the detached scenario.
Missing-worktree recovery now uses the repository's primary remote instead of assuming origin. A test covers a sole upstream remote. No actionable merge-blocking risk remains.
Pre-merge checks: 4
Check name
Status
Explanation
Title check
The title names the change: restored worktrees now find pushed thread work on a non-origin remote. It matches the code changes, which resolve the primary remote for pushed-branch lookup and the remote…
Linked Issues check
[#35751] The only directly linked issue asks that missing-worktree recovery restore a deleted thread branch from its pushed tip on the sole configured remote, including non-origin remotes. The diff in…
Out of Scope Changes check
All changes connect to the issue. restoreMissingWorktree.ts changes the pushed-branch lookup and remote-HEAD fallback to use the resolved primary remote. Null handling on lookup failure falls back to …
Description check
The description follows the repository template. It has Problem, Change, Scope, Verification, and agent attribution sections. The Problem section states the bug: a sole remote not named origin causes …
Full details: Title check
Explanation
The title names the change: restored worktrees now find pushed thread work on a non-origin remote. It matches the code changes, which resolve the primary remote for pushed-branch lookup and the remote-HEAD fallback in restoreMissingWorktree. It is a conventional commit, but it is long at 78 characters and 11 words, which is above the concise guidance.
Full details: Linked Issues check
Explanation
[#35751] The only directly linked issue asks that missing-worktree recovery restore a deleted thread branch from its pushed tip on the sole configured remote, including non-origin remotes. The diff in apps/server/src/workspace/restoreMissingWorktree.ts resolves the primary remote through gitWorkflow.resolvePrimaryRemoteName (new in GitWorkflowService.ts, which delegates to the existing GitVcsDriver.resolvePrimaryRemoteName). The pushed-branch lookup now uses refs/remotes/<remote>/<branch>, so a sole remote named 'upstream' is found. The remote-HEAD fallback in resolveRecreateBase also uses the resolved remote. The code only reads remote-tracking refs and does not write them. The issue's coding requirement for a non-origin sole remote is met by this code. The added integration scenario 'pushed-sole-remote' in ProviderTurnStartService.test.ts covers that path, per the PR description and the test summary. I did not run the test. Non-coding items (manual UI/provider testing, the workaround, and evidence capture) do not apply.
Full details: Out of Scope Changes check
Explanation
All changes connect to the issue. restoreMissingWorktree.ts changes the pushed-branch lookup and remote-HEAD fallback to use the resolved primary remote. Null handling on lookup failure falls back to the existing no-remote path. GitWorkflowService.ts exposes resolvePrimaryRemoteName, which the recovery code requires. The test file adds the sole-remote regression scenario. The PR does not add unrelated behavior. The 'Not in this change' note about multiple remotes with origin present is a stated limit, not an out-of-scope change, and it matches the issue's sole-remote scope.
Full details: Description check
Explanation
The description follows the repository template. It has Problem, Change, Scope, Verification, and agent attribution sections. The Problem section states the bug: a sole remote not named origin causes the pushed thread tip to be missed, and the branch is recreated from the project branch or HEAD. The Change section explains the primary-remote resolution and the no-remote fallback. The Scope section links issue #35751 and describes the bug, so it meets the bug-fix-only rule. The Verification section gives a focused reproduction on main, the exact test command, the observed failing and passing results, and the check:changed outcome. It also lists what was not exercised. The evidence table and recordings cover the web flow. Minor gap: the Verification section does not state the test result after the fix in full detail, and the template asks for screenshots for UI changes, which are present. Overall the description is mostly complete.
Finishing Touches
Generate unit tests (beta)
Commit to this branch
Create a new PR
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Limit details: You’ve used all 10 included reviews currently available. Your 0 included PR review attempts over the past 7 days set your current allowance at 10 reviews per hour.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
size:S10-29 changed lines (additions + deletions).vouch:trustedAuthor is trusted by repo permissions or the VOUCHED list.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
github-actions
Bot
added
vouch:trusted
![macroscopeapp[bot]](https://avatars.githubusercontent.com/in/900172?s=60&v=4){kind=small}
When a thread's worktree and local branch were both missing, recreateMissingWorktree looked for the pushed thread tip only at refs/remotes/origin/, and the detached-HEAD fallback in resolveRecreateBase looked only at refs/remotes/origin/HEAD. With a sole remote under another name (e.g. 'upstream') both checks missed, so the branch was silently recreated from the project branch or HEAD and the pushed commits were lost. Recovery now resolves the repository's primary remote with the existing GitVcsDriver.resolvePrimaryRemoteName ('origin' when present, else the first remote; already used by GitManager and the driver's base-ref logic), now exposed through GitWorkflowService. It uses that remote for both the pushed-branch lookup and the remote-HEAD fallback. With no remote, both lookups are skipped and the branch is rebuilt from the project branch or HEAD as before (resolvePrimaryRemoteName errors are mapped to null with orElseSucceed, the existing pattern). No new regex or parser.
Fixes #35751
Reproduction on main
On origin/main 59e64ee I extended the existing real-git integration test 'recovers the local or pushed thread tip, else the current branch, remote default, or detached HEAD' in apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts. The test drives ProviderTurnStartServiceV2.start, which calls makeRestoreMissingWorktree, against real repositories and a local bare remote. The new 'pushed-sole-remote' scenario follows the earlier scenarios, which push feature/restore and leave the project checkout detached at the project tip. It renames the only remote from origin to upstream (refs/remotes/upstream/feature/restore keeps the pushed thread tip), removes the worktree, prunes, and deletes the local feature/restore branch, then starts a turn. Result: the recreated worktree's HEAD was the project tip (ba44853d…), not the pushed thread tip (a98d02d5…), and thread.txt was missing. The unmodified test passes on main. Run with: cd apps/server && vp test run src/orchestration-v2/ProviderTurnStartService.test.ts -t "recovers the local or pushed". There was no UI or provider run; the test exercises the server's turn-start recovery path with real git.
Evidence
Web client, Chromium, 1280×800, light theme, fresh synthetic state and Replay provider on both commits.
Create a worktree thread, commit thread.txt, and push feature/restore. Detach the project checkout at an unrelated commit containing project.txt. Rename the only remote from origin to upstream, remove the worktree, prune, and delete the local thread branch. Resume through the web composer and open Files.
The base silently resumes without thread.txt. The fix preserves thread.txt and the pushed branch tip.
Scenario and seed driver. Recordings begin after pairing.
Not shown:
Tests
cd apps/server && vp test run src/orchestration-v2/ProviderTurnStartService.test.ts -t "recovers the local or pushed": fails without the fix (wrong worktree HEAD commit), passes with it. vp run check:changed: format, lint, knip, graphql, typecheck (3 packages), tests (3 files, 53 tests) all passed.
Not in this change
Who did the work
Run by the t3code factory in T3 Code.